Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 3 Feb 2010 21:56:48 +0000 (21:56 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 3 Feb 2010 21:56:48 +0000 (21:56 +0000)

Trivial merge